Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Nightly into Stable #7284

Merged
merged 132 commits into from
Jul 28, 2024
Merged

Merge Nightly into Stable #7284

merged 132 commits into from
Jul 28, 2024

Conversation

ronny1982
Copy link
Contributor

@ronny1982 ronny1982 commented Jul 27, 2024

All commits cherry picked and applied by using the merge script

Merge Nightly to Stable
# Run these commands in your local HakuNeko fork (remote of the fork must be on GitHub!)

# switch to master branch (nightly)
git switch master
# sync the master branch of this fork with the master branch from the official repository
git pull https://github.com/manga-download/hakuneko.git master

# switch to 6.1.7 branch (stable)
git switch 6.1.7
# sync the 6.1.7 branch of this fork with the 6.1.7 branch from the official repository
git pull https://github.com/manga-download/hakuneko.git 6.1.7

# create a new branch based on 6.1.7 for merging all new changes from master into 6.1.7
git switch -c merge-nightly-stable
# cherry pick all commits from master that were introduced after the last commit present in 6.1.7
git rev-list --reverse --max-age=$(git show -s --format=%ct HEAD) master | git cherry-pick --stdin
# push the new branch to the remote of the local fork
git push --set-upstream origin merge-nightly-stable
# the local branch is no longer required and can be removed
git switch master
git branch -d merge-nightly-stable

# All done, now create a pull request on GitHub: fork/merge-nightly-stable => official/6.1.7

Merge conflicts occured in f7c0b1a when cherry picked from 4318aac, not sure if they were resolved correctly.

TristanWasTaken and others added 30 commits July 27, 2024 02:18
* Change url and fix paste support

* Use regex to extract slug
Fixes #6682

Websites based on MH has been tested too :)
* Lezhin : change manga list endpoint

* Lezhin : change locale code
* RandomScan : rebranding to LuraToon

* update randomscan icon
Turns out selector is invalid in our old chrome
Filtering picture another way
updating the link data
* get mangalist from cdn

* fix lint error

---------

Co-authored-by: MikeZeDev <[email protected]>
* AlliedFansub: change domain and template Fixes #6793
* Nivera : change domain Fixes #6792
* FIX TCBScans: workarourd for 404 errors

1) Website changed url (unrelated)
2) They deliberately introduce missing junk pictures in popular manga chapters. 

Since they cant be distinguished by name pattern, we use another method ;)

* requested changes

* changed logic for fake pages

missing pages are always at the end, so we start testing pictures backwards and stop when its good.

* tbcscans: fire all promises and wait
MikeZeDev and others added 20 commits July 27, 2024 02:31
* Voidscans : Change domain

Fixes #7135

* Update NtsVoidScans.mjs

remove space

* Delete src/web/mjs/connectors/NtsVoidScans.mjs

delete NtsVoidScans

* Delete src/web/img/connectors/ntsvoidscans

delete NtsVoidScans icon
* Aniwave : fix checksums & getting playlist

* Fliemoon : fix getting playlist url

* Aniwave ; fix WAF antiscraper check

* try...catch in async promise
Tested working with websites

ComicMedu
BigComics
ChampionCross
YoungChampion
MagKan
* LuminousScans : change domain & filter pages

* Mindafansub : change domain & use Madara
* KomikTap : change domainn

* KomikCast : change domain and fix getting pages & clipboard
well, website is too slow
* FIX : ReadComicOnline.li : updated script to get image URLs as the old JS variable is removed

Fixes 'lstImages is not defined' error and also catches the error instead of failing with a timeout

* implement suggestion by @ronny1982 , replacing blogspot size parameters with =s0

* Forgot to escape backslash with JS backtick quotes
@ronny1982
Copy link
Contributor Author

Suggestion to close PR after Saturday, 19 October 2024 (12 weeks) if not approved by a reviewer.

Copy link

cloudflare-workers-and-pages bot commented Jul 27, 2024

Deploying hakuneko with  Cloudflare Pages  Cloudflare Pages

Latest commit: 85eef8a
Status: ✅  Deploy successful!
Preview URL: https://648ff043.hakuneko.pages.dev
Branch Preview URL: https://merge-nightly-stable.hakuneko.pages.dev

View logs

@MikeZeDev
Copy link
Contributor

Pretty sure the conflicts were solved correctly. I mean, i remember you locked the version when i complained about CI, but i dont remember about changing eslint command line.

Also you may wan to include #7111. Its a regular website now there is nothing to see..

@ronny1982
Copy link
Contributor Author

Pretty sure the conflicts were solved correctly. I mean, i remember you locked the version when i complained about CI, but i dont remember about changing eslint command line.

Also you may wan to include #7111. Its a regular website now there is nothing to see..

Changes for 6.1.7 should only be cherry picked from master, otherwise it will become quite messy when cherry picking randomly across different branches.
Furthermore the PR is not yet approved.

@ronny1982 ronny1982 merged commit 71cc7a6 into 6.1.7 Jul 28, 2024
1 of 4 checks passed
@ronny1982 ronny1982 deleted the merge-nightly-stable branch July 28, 2024 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.